Merge from origin/emacs-26

008b263 (origin/emacs-26, emacs-26) * lisp/gnus/gnus.el: Mark autoloa...
daf32f1 Speed up redisplay of HELLO
d8a6d82 Improve documentation of 'safe-local-variable' property

# Conflicts:
#	etc/HELLO

diff --cc doc/lispref/variables.texi
Simple merge

diff --cc etc/HELLO
index a56a73bc1d2587ee48970dbb8c05c202563e9523,f424a2ab8aa4e8c3fd8af7bd4ad1838ff140f68f..1c4381c3e27502d9410ec5b8a19bd083ca9c37f1
--- 1/etc/HELLO
--- 2/etc/HELLO
+++ b/etc/HELLO
@@@ -123,5 -95,6 +123,11 @@@ along with GNU Emacs.  If not, see <<ht
  ;;; Local Variables:
  ;;; tab-width: 32
  ;;; bidi-display-reordering: t
++<<<<<<< HEAD
 +;;; coding: utf-8
 +;;; End:</x-charset>
++=======
+ ;;; coding: iso-2022-7bit
+ ;;; inhibit-compacting-font-caches: t
+ ;;; End:
++>>>>>>> 008b263

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge